From: Jonathan Lebon <jonathan@jlebon.com>
Date: Thu, 19 Apr 2018 13:58:51 +0000 (-0400)
Subject: tests: Port the last python2 script to python3
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~24^2~32
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8cfef187c5e80eac90a61fbbe98a0c7dd3ff9930;p=ostree.git

tests: Port the last python2 script to python3

This is not used by any test, nor is it packaged. Though let's just port
it over to py3 to certify our codebase completely py2-free. I've
manually checked that the script is still functional.

Closes: #1546
Approved by: cgwalters
---

diff --git a/tests/grub2-entries-crosscheck.py b/tests/grub2-entries-crosscheck.py
index d68394d3..f2a68115 100644
--- a/tests/grub2-entries-crosscheck.py
+++ b/tests/grub2-entries-crosscheck.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # Copyright (C) 2015 Red Hat
 #
@@ -19,6 +19,7 @@
 
 import os
 import sys
+import functools
 
 if len(sys.argv) == 1:
     loaderpath = '/boot/loader/entries'
@@ -40,7 +41,7 @@ def get_ostree_option(optionstring):
         if o.startswith('ostree='):
             return o[8:]
     raise ValueError('ostree= not found')
-            
+
 entries = []
 grub2_entries = []
 
@@ -59,7 +60,7 @@ for fname in os.listdir(loaderpath):
             v = line[s+1:]
             entry[k] = v
         entries.append(entry)
-    entries.sort(compare_entries_descending)
+    entries.sort(key=functools.cmp_to_key(compare_entries_descending))
 
 # Parse GRUB2 config
 with open(grub2path) as f:
@@ -68,7 +69,7 @@ with open(grub2path) as f:
     for line in f:
         if line.startswith('### BEGIN /etc/grub.d/15_ostree ###'):
             in_ostree_config = True
-        elif line.startswith('### END /etc/grub.d/15_ostree ###'): 
+        elif line.startswith('### END /etc/grub.d/15_ostree ###'):
             in_ostree_config = False
             if grub2_entry is not None:
                 grub2_entries.append(grub2_entry)